Merge branch 'mg/tracked-local-branches'