Backporting of F3 improvements