BC-1799 #resolve query exists + setNull by customerRoleIds