[z2027] Improve recent commits. Thanks to Reamer and stfx for pointing

(based on commit cea8c7f)

(based on commit [s1640] - 5243bbd)