Global resource file: Name shortened.
Merge remote-tracking branch 'origin/master'