OSDN Git Service

Merge cherrypicks of [2805728, 2805966] into oc-r5-release