Fixed removal of keys
Merge branch 'master' into develop_choicefield_refactor