Merge branch 'DarrenEastman-main-patch-36e4' into 'main' See merge request !3504
mentioned in commit d8b9cb3c