OSDN Git Service

Merge cherrypicks of [3089203, 3089096] into oc-m2-release