386.03 More alignement changes
386.03 minor changes to align with g2 build 014.03