Merge with latest V4.0