Merge "Make schemeInitData constructor ref non-static" into rvc-dev