Merge remote-tracking branch 'segfault/bugfix/15462-fix-search-box' into stable (fix-committed: #15462)