Merge branch 'feature/gen-magic' into 'develop'