Add additional logging information.

[merge]