Merge "Additional logging to track down RSRuntimeException issues." into klp-dev