Merge "Avoid empty line for storage summary" into main