Merge pull request #4122 from jmarshallnz/separate_db_analytics