Guillaume Smet commented on Improvement HHH-9497