72710c0318
Sadly contains some changes that hard to merge into appropriate commits introduced after rebasing repeatedly