Merge "init: add extra std::move"