[z1968] Sync code style with master.

(based on commit c697d8a)

(cleaned version of 9abaa1f)

(based on commit [s1557] - 282e04d)