WDC release 30-04-2018

//WDC release 30-04-2018