This MR merges changes from CE https://gitlab.com/gitlab-org/gitlab-ce/compare/4b6fd0df62a987d9a5f6f0ba3df8a986396901e0...1d51bc7dfd04886fa5af69a60bb509691d697813