Merge "Remove stale comment and add copyright notice" into rvc-dev