FED-76: Fix reverted changes (and side effects) that were missed at the last master/HEAD rebase - affecting the legacy BP1 message DAO.