JFP-ification of 3.0 and 3.1.