Updated assets from latest code drop received (12/06/2014)