Merge "Bugfix: Convert the string list to list"