Ticket #31679 RBC custnum fix