BC-1852 #resolve CustomerRoleCatalog