Merge "Remove STL dependency"