Fixes #6682
Fixes #6684
Fixes being unable to knock on windows.
Merge pull request #6688 from Zuhayr/dev-freeze

Dev freeze fixes