[#874516] Gallery Fixes