merge from master to branch

code merge from master to branch