[go: nahoru, domu]

Merge "More following of refactoring." into rvc-dev