Client: Added knock code authentication
Merge