Fix issues from staging merge

18 jobs for !66 with OCF64-rel17-to-rel18
in 17 minutes and 19 seconds, using 0 compute credits, and was queued for 6 seconds
latest merge request