Rebasing tempest

added latests tempest commits
Merge branch 'alvico-dev-reb' into development