Merge pull request #4787 from BrzVlad/fix-degraded-mode