[z2116] Improve [z2050]

Partial backport

(based on commit [12178] - 8314222)

(based on commit [s1741] - c94afc7)