merge: Fix builder issues related to merge 552b29b.