Merge "Use manifest fragments" into rvc-dev