Merge "build: core: Fix issue in recovery"