Merge with fxp upstream