Synced to updated rust-core