Backported release 0.9.6 into develop
Backported release 0.9.6 into develop

University-of-Auckland/applicationbase,ausaccessfed/applicationbase,ausaccessfed/applicationbase,University-of-Auckland/applicationbase,ausaccessfed/applicationbase,University-of-Auckland/applicationbase