Merge "Fix "NotFound" error in _clear_stacks()"