Fix -F option since that is already taken
Merge branch 'Issue-42+IE-827'