Merge branch 't691' into resolved
t696 fix for surveys to be pre-filled with a clinical reminder
Merge branch 't696' into po_ready