Merge "Gracefully handle negative indexes." into rvc-dev