TESB-10315 improve performance for Derby