Fix zone folders for #84294
Repair special cases for #84294
Merge pull request #101 from alediator/84294-IPT_revision2

84294 ipt revision2