Fix some script issues
Merge from Perforce
Merge branch 'imp/max_config'