Merge "Refactor tempest common"