Apply some recent changes of master to ru branch