Temporal fix for global.config
Merge branch 'r1411'