[forge-dev] Forge/core branch changes