Bump manifest version
Add support for rebase
Bump manifest version