Merge "Merge "No need to std::move local variable to return value" into main am: 608316b4fb am: 7db248a4a3" into main