UPD: #1225 for GalleryModule + small PSR and somes fixes