Merge branch 'kd/pull-rebase-autostash'