Merge branch 'log-slow-queries' into 'develop'