Merge "Fixes dynamic networks falling back to ctlplane" into stable/pike