Move the new feature for 5.0.1 into the right place