Guillaume Smet commented on Improvement OGM-1156