Merge pull request #884 from chloe-jeong/trunk-ko