IKASAN-731 - flow performance improvements
IKASAN-731 - flow performance improvements