Return instance in methods.
Add clearCalls().
Merge branch 'feature/manifest' into develop