this has the GalleryApp change but not others
Merged