Merge "Support title_with_entity and title_without_entity"