fix for f4
Merge branch 'f4' into mp1