Revert "corrected log messages"

This reverts commit ba3dbbc3fbd8c0c5e5ed90542cb2352351a79490.
Revert "Revert "corrected log messages""

This reverts commit c513f66dc2670e4a8d56b11412111b5236e3a747.
Merge commit 'ada9666d464b0bc04b0b9fecd142b138a2cf4cff'