Merge "Fix cross profile attribute parsing" into rvc-dev