Added properties by hand
Merge remote-tracking branch 'upstream/integration' into proto

* upstream/integration:
  Added properties by hand
ConfigurationManager dev