[z1971] Backport second part of [9083]

(based on commit 5f17e8c)
(based on commit 4fcb4ad)

(cleaned version of e37bc3d)

(based on commit [s1560] - 889c526)