Merge branch backport/id_short_validation with refs/heads/master into refs/merge-requests/79/train

2 jobs for !79 with backport/id_short_validation into master in 1 minute and 41 seconds
merge train