OSDN Git Service

Merge changes from topic "am-f5dc500e-4d32-4849-891e-c618cef666de" into oc-dev