[MAT-358] Use Logger where appropriate