[MERGE] merged the branch 3