Merge branch fix/idShort_onchange_collision with refs/heads/master into...

Merge branch fix/idShort_onchange_collision with refs/heads/master into refs/merge-requests/60/train
2 jobs for !60 with fix/idShort_onchange_collision into master in 54 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Test
passed #1087961
static_analysis

00:00:47

passed #1087960
test

00:00:54

90.0%