Jf-common updates