LL-529 #close Using entityUpdate call instead.