Restricted Roughedge and Sharpened Sword for Kithgard Gates Builder's Hammer swap, too.
Merge branch 'master' into production