Update to latest F3 v3-1-2