Merge "refactor Property::Map interface." into devel/master