CR-BITMAG-287 minor updates in accordance to review