Merge "Fix for UDS build job"