Updates from wm2 140903