Merge "Better definition of "system" as "self"." into rvc-dev