Merge branch 'feature-logging' into develop