I would like to mark this one Resubmit, because:
1) the current master structure has changed, possibly rendering the original proposal obsolete
2) It's not clear to me if the original proposal was modified by all the comments.

Andrei, could you look at the structure in 5.0.0 and re-formulate your proposal as needed?