Merge pull request #5120 from dibdot/fwknopd-fix