updated status from mdv commit f2d2ed7