Merge "No need to std::move local variable to return value" into main