Merge "resolve merge conflicts of 621f1d895b134099c0c95b86ba802c86332ecaca to master"