Recommit and modified 4.1.6 due to test failure.