Merge cleanup
6.0.2