Updates #4866 by dr-j NOTE: enter raid without raid is still missing. (cherry picked from commit 4fef02c4c91ab2fa4f358dc0abc8780a451fe43d)
Updates #4866 by dr-j NOTE: enter raid without raid is still missing. (cherry picked from commit 4fef02c4c91ab2fa4f358dc0abc8780a451fe43d)