Dc/Melanie |#0000| Fixing ft for advanced questionnaire
DC/Melanie | #0000 | fixing ft
Dc/Melanie |#0000| Fixing ft
Merge branch '17_0_release' into develop