Gf 1234 soongil

from: GF-1234-soongil branch
to: master branch