Merge "Yangman - fix collections delete and parameters validation"