[z1811] Add missing files of previous commit

(based on commit [s1369] - b704529)