OSDN Git Service

Merge "Address further API review comments" am: b279ec51b6 am: cf8e06c0ac