Merge "Logging to aid bug investigation." into rvc-dev