Merge branch 'master' into add_knowledge_base

8 jobs for add_knowledge_base in 141 minutes and 8 seconds (queued for 1 second)