Updates from wm2 141114