Changed logger
Merge branch 'tmp3' into rc1/develop