Preserve property order (GH-216)
CHANGELOG for GH-216