bms: sync with jb_2.5 --> merge rest of file