Merges gitlab-org/gitlab-ee!803 in the right place.
This was already merged in EE because I sent the MR there by accident.