Clean rebase for proposed changes
Examples and other files rebase
Refactor preserving call chain for backward compatibility