Merge "Performance optimizations" into rvc-dev