WCM-9 Rebase with changes from Platform

@csierra
@migue
@ealonso