Add shared.
merged

Merge branch 'master' into oshima
shared -> oshima