Merge "Refactor Daisy verify jobs"