specs and merge fixes
Merge branch 'property_merging'