Re-apply missing changes after merge with production.

Signed-off-by: David Seaward <david.seaward@puri.sm>
2 jobs for merge_prod_master_20200506 in 2 minutes and 8 seconds (queued for 2 seconds)
latest