Backport missing develop mr into release 8.1

When develop branch became OTB 9, there was too much changes between branch release-8.1 and develop : when an MR was done on develop, we had to cherry pick the commits one by one on release-8 to be sure not to include glitches in the merging process. Unfortunately the high number of MR led to a side effect : one MR is missing on release-8.1 and two MR were planned for release-8.2 but can be included in 8.1 without problem. This MR fixes this