synced to Perforce Change 550532