Merge branch 'stable-3.0'

* stable-3.0:
  BrokerApi dynamic item setup

Change-Id: Ic59c170c6cd151bf7a4caf121dc5cd4ddc1223d8