Merge pull request #15353 from ja-pa/knot-resolver-5.3.1