Merge "Add support for excluding tags from restrictions" into sc-dev