Merge branch 'ab/case-insensitive-upstream-and-push-marker'