Using new jf-common

Change-Id: I54c38d052795a9c912a4953d4cbcfee03778ab71