Merge branch 'develop' into 008-solr-knowledge
CT fix
Merge branch '008-solr-knowledge' into develop