[z1977] Some missing code style backports from master

(cleaned version of f4adf23)

(based on commit [s1569] - b58e066)