FORGE-1699 - Performance optimization.
FORGE-1699 - Performance optimization.
FORGE-1699 - Performance improvements