Merge "Yangman - update collection saving"