Add key length check
Add USPS & auto-reg settings
Fix secret length check
Merge branch 'fix_secret_length_check' into 2-3-stable