Merge branch 'feature/entry-form-96' into prototype