Backport patches

Vlad Zahorodnii requested to merge work/zzag/cherry-pick-a-batch-of-patches-iii into Plasma/6.0 Jan 24, 2024