Closes https://github.com/gitlabhq/gitlabhq/issues/9844
Closes https://github.com/gitlabhq/gitlabhq/issues/9860
Closes #3559 (closed)