Merge "Backport: Replace std::bind2nd usage with a lambda to fix C++17 build"