Closes #40379 (closed) #40398 (closed) #40373 (closed) #40378 (closed) #40368 (closed) #40372 (closed) #40354 (closed) #40367 (closed)
Rebased onto master and includes updates for Fenix.
Closes #40379 (closed) #40398 (closed) #40373 (closed) #40378 (closed) #40368 (closed) #40372 (closed) #40354 (closed) #40367 (closed)
Rebased onto master and includes updates for Fenix.