Merge "Expand "extras" support in content tool." into rvc-dev