BITMAG-1042: Followup on CR-BITMAG-314