"Clear" ZF
Merge origin/master