Manual upstream GitLab merge
This one is small (16 non-merge commits), but has a conflict resolution in the create form and important changes in Project removal.
This one is small (16 non-merge commits), but has a conflict resolution in the create form and important changes in Project removal.