OSDN Git Service

Merge back staging AVS changes for v4.21.