Merge branch 'ow/stash-with-ifs' into maint