Bug 956366 - v1 status cleanup and fix v2 status exceptions.