Merge branch 'master' into uidev
Merge branch 'master' into uidev
if click-to-edit value changed to blank string, then treats no change
Merge branch 'uidev'