Merge branch 'bugfix/16451-fuzzy-ublock-patch' into devel (Fix-committed: #16451)