MOB-162 Unfortunately I need to check for it twice
Merge branch 'MOB-162-Broken-galleries-on-modal' into dev