Adding the stable code to main.

This code is already used in production, fairly stable. It is not a release yet, but close to it. However, there will be some new features implemented and needed the already stable stuff to be in a safe place, where we can change to it fast.