merging from branch Release 6.0.0