[CTL-57] Several performance improvements