MLHR-1217 #resolve