OSDN Git Service

Merge changes from topic 'hals-should-use-mapper' into oc-dev