changelog
Merge branch 'staging' into develop
logging fix