FORGE-1699 - Performance optimization.