merged ex_shutdown into nepi-3-dev