Merge "Opt-out of STL"