Merge "Add hacking check for service tags in scenario"