Merge branch fix/id_short_namespace_update with refs/heads/master into refs/merge-requests/71/train

2 jobs for !71 with fix/id_short_namespace_update into master in 1 minute and 8 seconds (queued for 3 seconds)
merge train