Sanitizing commit - refs BT#7154