Merge branch 'Issue/2107-UIv2MigrationFixesforrootUI' into 'dev'

Issue/2107 u iv2 migration fixesforroot ui

See merge request !56
1 job for dev in 3 minutes and 41 seconds (queued for 2 seconds)