and syncronize with xcode 3 project
close #8382

(not cherry-picked from 4065770e62dfe240c597c4154079a21c6ce3f7fe)