OSDN Git Service

Merge changes from topic '7_CLS_topic' into oc-dr1-dev am: b8ad0fd508