Merge "Considering to mainline moudle to move some resource to v31" into sc-dev