S7, I answered. :) Depends. You can still go with just Master in case it has all information on your background. If Diploma is a totally different education but matters for your NOC, add it, as long as it's not too hard to get.
We however sent just 1 degree, as another was 1) irrelevant to the...