ART-1169: some performance improvements