Tempest rebase

Added latest tempest changes