Merge pull request #1736 from kodustech/fix/conversation-gitlab