Merge branch 'feature/1737-magic-key-field' into 'develop'