Merge branch 'develop' into 008-solr-knowledge
Search form dev.
Search form dev
Merge branch '008-solr-knowledge' into develop