[dev] Merge branch feature.basic into dev

There may still be more to do on that branch, but it is already usable and addresses numerous issues: #290, #306, #313. We've merged it locally and haven't run into any issues (except for one ReferenceError, quickly fixed).