Merge enhancements from CarStory