Merge "Support profile global restrictions in disclosure messages." into oc-dev