Merge "Assorted dot-wrangling." into rvc-dev