Merge with v6.0.0