Merge branch 'kd/stash-with-bash-4.4' into maint