Merge "Revert^2 "Merge branch 'upstream-master'""