Merge "Call parent::getFieldsForSearchIndex in ContentHandlers"