Merge branch 'feature/9059_refactor_logger' into develop