to master with 3 change

to master with 3 change directly