Fix MLHR-1510