Merge "Address leftover TODOs from inline suggestions." into rvc-dev