Merge fixes from production.

Signed-off-by: David Seaward <david.seaward@puri.sm>
2 jobs for merge_production
in 1 minute and 53 seconds, using 0.0 compute credits, and was queued for 0 seconds