IKASAN-731 - flow performance improvements