Merge branch 'its9343' into 'master'

Draft: ITS#9343 More policy selection criteria

See merge request !586
3 jobs for !586 with its9343 into master in 12 minutes and 27 seconds (queued for 2 seconds)