Merge "Fix crash at SDC deploy"