fix to support project file and scheme name to contain spaces
Merge branch 'release/r8p5'