Merge "fix clat on restricted networks" into tm-qpr-dev