Bug 23539: (RM follow-up) Update DBIC classes