Merge branch '1.9' into 1.10

That contains merge from 1.9 branch