Fix runtime build after rebase to master