Backported release 1.0.1 into develop
Backported release 1.0.1 into develop

ausaccessfed/rapidconnect,ausaccessfed/rapidconnect,University-of-Auckland/rapidconnect,University-of-Auckland/rapidconnect,ausaccessfed/rapidconnect,University-of-Auckland/rapidconnect,University-of-Auckland/rapidconnect,ausaccessfed/rapidconnect