AUI-1633

This PR will definitely conflict with https://github.com/jonmak08/alloy-ui/pull/244. Let me know which one makes it in first and I'll rebase the other so it goes in cleanly.