Merge pull request #16890 from paper42/knot-resolver-5.4.2