proper branch for jf-common