Merge pull request #7348 from PsiOmegaDelta/dev

Dev