jf: upgrade the entire tree to 4.3