Major feature update

[Vsevolod-Livinskij]

This is a cumulative commit that brings all of the features that were living in separate branches together to the trunk.