[M] Update local repo and fix conflicts
[M] Update local repo and fix conflicts