Merge branch 'stacking-fixes' (vfs stacking fixes from Jann)