NRFE-322: image gallery support