OSDN Git Service

Merge cherrypicks of [3484108, 3483651] into oc-m2-release