Guillaume Smet commented on Improvement HHH-11264