MFH (r268888): fix false negative for empty groupsPR: 109416MFH (r268890): add support for "account" facilityPR: 115164