Merge branch 'ticket-589' into resolved
fixed a defect where follow up questions were not rendering
Merge branch 't607' into po_ready