Integrate fixes from UD

Closed Loïc Grobol requested to merge dan-fixes-2021-04 into master

Merge request reports