BITMAG-1033: Followup on CR-BITMAG-322