Merge R1.06 from Master @ 6/9

Merge R1.06 from Master @ 6/9