Merge the codes of STORY[001] to master branch