more GMT5 fixes
Merge branch 'develop'