Proposed new master

Not to be merged, only reviewed.