Merge branch 'develop' into feature/gen-magic