LPS-48810

More fixes in destroy behavior