Merge "Fix res not found in PromptInfo." into main