Merge branch 'develop' into test
Re: #1703 db change to persist application of search terms
Merge branch 'ticket-1703-translations' into develop