sync from jb_2.5