Partial updates from 4.2.2 to build with jb-dev branch