Miguel Diaz commented on Improvement HHH-1542