Merge "Additional cleanup after stack deletion." into klp-modular-dev