Adding the changes up through 5.4.4, including a test.