Add logging #3717
Merge branch 'master' into displayName