Merge "Remove duplicated comment section" into rvc-dev