Merge pull request #1719 from benjidotsh/rag-ai/improve-new-backend-s…

Merge pull request #1719 from benjidotsh/rag-ai/improve-new-backend-s… #1137