Merge "Remove Network Restrictions duplicate from setting search" into oc-dev