Merge branch 'bug_480_nfiflash' into experimental