Merge "More consistent controller logging."