Merge "Add support for two-stage transitions in STL" into main