Rebasing tempest latests changes

Added the latests tempest commits into the development branch