Merging backend/ai branches