Proposed new master

Not to be merged, only reviewed.

If approved, this code will be master.