Merge "Check for stacks delete in progress"