Merge "[sf] Stop inheriting from std::unary_function" into main