Merge remote-tracking branch 'origin/jb-mr2-zeroday-release' into HEAD