Merge "Remove unnecessary parent restriction check" into rvc-dev