Merge "Part of compatibility getRaw() support" into sc-dev