'Merge logger code from 'develop' branch