Fixed: expanded properties were not removed during save
Merge branch 'develop'