Merge branch '12'
wada