Merge branch 'B10505DndBrokenOnMultiDb' into 'develop'

B10505 dnd broken on multi db

See merge request !340
3 jobs for develop in 4 minutes and 4 seconds (queued for 3 minutes and 12 seconds)