Merge User-prompt branch changes.