OSDN Git Service

Merge cherrypicks of [3666886, 3666906] into pi-release