Merge from Perforce
Solve the conflict