Merge "acdb: B5_ACDB_V0_20191031" into qt-qpr1-dev