fix on merge

17 jobs for merge-12.1.8 in 8 minutes and 48 seconds (queued for 1 second)