MLHR-1171 #resolve