Merge "Make SSM failure logging more consistent"