Staging instance, all changes can be removed at any time
based on !133 (merged). Fixes more issues detected by real life testing.