Merge "remove gate tag (part 3)"