merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev