add f3 to master
conflicting change
Merge remote-tracking branch 'origin/master' into R42-NTX