Merge "resolve merge conflicts of fb7cd41508672e1e6bffadcb835441124632f672 to master"