changed some logging messages.
Merge branch '4.3'