MLHR-1154 #resolve