Updates in line with core.

Hi Bas,

Updates in line with core.  Specific MDL's in comments.

Cheers,

Gareth