Merge branch 'AST-960-select-correct-PSF' into 'main'

AST-960 Select the correct PSF

Closes AST-960

See merge request !84
12 jobs for !84 with AST-960-select-correct-PSF into main in 3 minutes and 26 seconds (queued for 1 second)
latest