Merge branch 'master' into instance/fid

themes/finc/templates/RecordDriver/SolrMarc/link-related.phtml

+<?=$this->url('search-results')?>?lookfor=<?=urlencode($lookfor)?>

themes/finc/templates/search/history.phtml

@@ -36,7 +36,8 @@
   <?php endif; ?>
   <?php if (!empty($this->unsaved)): ?>
     <?=$this->context()->renderInContext('search/history-table.phtml', ['showSaved' => false]);?>
-    <a href="?purge=true"><i class="fa fa-remove" aria-hidden="true"></i> <?=$this->transEsc("history_purge")?></a>
+    <?php /* refs #17072: added url - GG */ ?>
+    <a href="<?= $this->url('search-history') ?>?purge=true"><i class="fa fa-remove" aria-hidden="true"></i> <?=$this->transEsc("history_purge")?></a>
   <?php else: ?>
     <?=$this->transEsc("history_no_searches")?>
   <?php endif; ?>