Merge branch 'postmeeting/fixingR18' into 'postmeeting/SA96'
Moving R17 changes across to R18 See merge request !49
WARNING! Gitlab maintenance operation scheduled for Thursday, 18 June between 19:00 and 20:00 (CET). During this time window, short service interruptions (less than 5 minutes) may occur. Thank you in advance for your understanding.
Moving R17 changes across to R18 See merge request !49