Merge branch 'develop' into new-global-classes