Merge "Add TF flag to allow transitions when empty" into main