Merge remote-tracking branch 'origin/issue343_dlcqi_retransmission' into develop_integration_2018_w36