Merge "Introduce channelConflated Flow builder" into main