WCM-9

WCM-9 Rebase with changes from Platform