Fixed: expanded properties were not removed during save
fixed bug if expand options is specified as array
Merge remote-tracking branch 'oafmedium/develop' into develop