Merge "[CS] Add an option to block sensitive network specifier" into pi-dev