Some improvements for standard block system.
Not for production use yet.
The work is in progress