Merge branch 'CON-1888-galleries' into CON-1788