Dont merge the pbxlib file
Merge branch 'master' into release/12.0