Merge "[Media ML] Sync with original implementation" into rvc-dev