Resolve MUWM-2286