correction previous commit : finish merge in CoreProduct-6.1.x from master