Guillaume Smet commented on Sub-task HSEARCH-2209