OSDN Git Service

Merge cherrypicks of [16816453] into sc-v2-release.