Merge "Yangman - fix saving collections"