fixed more merge commits

1 job for master in 20 minutes and 1 second (queued for 2 seconds)
Status Job ID Name Coverage
  Pack
passed #159800
pack

00:20:01