Fix for additional resource file problem (GDMS)
Merge remote-tracking branch 'origin/master'