Merge branch 'en/stash-df-fix'