Key improvements for 4.1

The link is here.