Merge "Modify the empty list ensure method"