Merge "Support TEMPEST_BRANCH with tag name"