Created by: jczaja
This is followup PR to #13553.
It also introduce a fix to BatchCompute path of this operator
