changes by ivendor/arco for jb-3.0