Merge branch 'feature/magicFieldAndElement' into develop