Merge some modified file to develop