Merge with latest 5.7.1