Merge pull request #5570 from systemcrash/rsn_preauth