Backported release 0.11.0 into develop
Backported release 0.11.0 into develop

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