Add logging
Logging should work even for const this
Merge branch 'f/add-logging' into develop