Resolve MUWM-2375