Prep logging ready for merge into develop