Merge "As foretold, this release goes to eleven." into rvc-dev