Add new file to merge no FF2
Merge branch 'bug3106'