Merge "Remove transition logic for old tempest option renaming"