add optional "unstack" step (disabled by default)