Merge "Move use of bucket before std::move" into main