*4169* Fix issue galleys and issue custom identifiers issue