Merge to master

Well, no one can do without this change.