Merging attributes triggers KVO
Version 1.11 (588.8)
Merge branch 'release/1.11' into develop