Revert "Trimmed the branch to only the lizi sub directory"

This reverts commit 7118a860189320c01c575abcc29d63cce4736f07.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the lizi sub directory