Prepare to export macros from state Subtotal

---

ok