merge with 6.0.1.final source