Reverting to fix fw screen missing issue
Merge branch 'dev'