DRTII-640 merge in master and fix conflicts
DRTII-640 merge in master and fix conflicts

UKHomeOffice/drt-scalajs-spa-exploration,UKHomeOffice/drt-scalajs-spa-exploration,UKHomeOffice/drt-scalajs-spa-exploration