Merge "JavaAdapter: add combineFlows with six inputs" into main