ES-1621: Merging forward updates from release/os/5.1 to release/os/5.2 - 2023-11-13#1336

Merged

ronanbrowne merged 4 commits intorelease/os/5.2from merge-release/os/5.1-release/os/5.2-2023-11-13-1

Nov 13, 2023

+33