Merge branch 'master' into development
[UPDATE] Fixes bug in legacy support
Merge branch 'development'