Fix build break after rebase
4 files changed