Apply changes to 5.6