FORGE-1699 - MAJOR Performance Enhancement