Fixed: Added missing files (ZF1)
(cherry picked from commit a59572c)
(cherry picked from commit 3fde0f6)