fixed more merge commits

1 job for master in 15 minutes and 48 seconds (queued for 1 second)
Status Job ID Name Coverage
  Pack
passed #159802
pack

00:15:48