Updates #2479. Squashed commit of the following: commit 0fdb0d041d0bd0d9af64513cf82397456a30e2f2 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Mon Mar 29 19:22:56 2021 +0300 dnsfilter: add a comment commit d5d6538b8b5133d7c1e9b242a8ac802448d40893 Merge:6a09acc2e710ce11Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Mon Mar 29 19:19:39 2021 +0300 Merge branch 'master' into 2479-simpl commit6a09acc262Author: jvoisin <julien.voisin@dustri.org> Date: Tue Dec 22 16:43:47 2020 +0100 Generalise a construct to simplify a function