MLHR-826 #resolve