Merge "Adding leaked stack check"