Backported release 1.3.1 into develop
Backported release 1.3.1 into develop

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