Uses cdb dist version
Merge branch 'fix/CDB-354' into develop

* fix/CDB-354:
  Uses cdb dist version