Handle situation led miss configured
Merge commit '094983a0d98524aab4a253c28018c8f64866dc02' into desktop