Luis Barreiro commented on Sub-task HHH-8559