fm: update from jb_2.5