Merge pull request #2342 from dibdot/fw