Merge "Allow snippet running on the legacy platfrom" into udc-dev