[forge-dev] FORGE-1761