Merge remote-tracking branch 'origin/347-remove-assertion-ue-dci-handling' into develop_integration_2018_w36