Be consistent with Data Plane case, per Tejaswi's comments.
Ravi's comments.
Last nit
Version 2 to print