merging VID-1854-gallery into VID-1939