[JBTM-2203] jespers-perf-improvements

!BLACKTIE !QA_JTA !QA_JTS_JACORB !XTS