Merge "Add support for testing transparent tags"