Backported release 1.4.0 into develop
Backported release 1.4.0 into develop

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