[forge-dev] Build broken due to FORGE-1823 and FORGE-1824