Apple Music - is it still applying DRM protection to CD's / own private content

Hi,

I know from when Apple music first launched, it went through a phase of applying DRM to consumers own media e.g CD's at the point of uploading it to the cloud.

iTunes match on the other hand does not, instead it sees if the file exists in the itunes store already and uploads it, with the option of re-downloading it in a nice 256Kbps AAC format, unprotected DRM of course.

However, in more recent articles, Apple states the following:-

If you have an Apple Music membership, you get all of the benefits of iTunes Match, plus access to the entire Apple Music catalog.

This still isn't very clear as to what i'm trying to establish so please see below.

My questions are as follows:-

1. I still have both an apple music and iTunes match subscription. If I cancel my iTunes match subscription, will I still be able to import / add unprotected media and have it upload to my apple music subscription AND be able to re-download it WITHOUT DRM protection?

2:- If I cancel my iTunes match subscription, will apple music "pick up from where iTunes match" left off or will it insist on scanning my entire physical library on my machine again, and then re-upload everything from scratch?

Thanks in advance