Closing v3.5.4