Merged with latest 4.0