merge in jb-nakasig-release history after reset to jb-dev