Merge from Perforce
Set the fixed channel