Merge pull request #1292 from TheBlueMatt/2022-02-override-handshake-limits