FORGE-1699 - Performance improvements