Merge branch 'mg/tracked-local-branches' into next