Integration 2021 wk19

Remi Hardyrequested to merge
integration_2021_wk19 into develop

MR !1028 (merged) : oairu
MR !1141 (merged) : nr-dmrs-fixes

Edited by Remi Hardy

Merge request reports