OSDN Git Service

Merge cherrypicks of [2878293] into oc-mr1-release