test
Added support for additional properties.
Merge branch 'scaffold_change'