Merging with 6.0.2