[MERGE]last three commits