Fixed
Merge branch 'hotfix/fix_list_serializer'