Merge "Do not delete stacks that are not empty." into klp-dev