rebase-into-staging2; but start another feature branch before merging th...

...is one