JFUSION-149 #comment preformance enhancement