Merge up with fxp upstream