synced to Perforce Change 573629
Merge remote-tracking branch 'origin/fromP4'
fixing merging issues