Merge "resolve merge conflicts of 3649f7c to master"