Fix batch entity update to only update changed attributes
Merge branch 'master' into qa