upstream changes are added to jb-dev branch