Merge change 911 into donut

* changes:
  Debug: Add setPropertiesOn(), and @hide it for now