Hi, Is there are any reasons to not cherry-pick mentioned change from the master? It may scare users who uses datapath version from branch and the fix almost clearly is harmless. Thanks!