Merge "Fix incorrect closing tag" into rvc-dev