#6470: Infrastructure tags