Minor - Code conventions - refs BT#8986
Fix full copy - refs BT#8986