Merge branch 'kkkunche-issue_302' (#307)