Merge "Add support for predictive back in STL" into main