Merge "Fix 'list results' spacing issues." into ics-mr1