fixed delete field when conditionally updating
Merge branch 'master' into spaceape-build