CRM-13807 - Fix last to commit to getBAO and add unit test