Merged with `git fetch <remote-git-url> <branch> && git cherry-pick FETCH_HEAD` #1270 #1301 #1303 #1304 #1314