Merge "Use correct "unset duration" constant" into rvc-dev