Rebase to the current tempest master

Rebase that include the latest tempest master commits and squashed our own commits to a single one