Merge "Don't use std::result_of" into main