Merge "Remove the fork of STL UserAction" into main