Merge change 5600

* changes:
  Rework the property parsing code.