fixed more merge commits

1 job for master in 23 minutes and 32 seconds (queued for 1 second)
Status Job ID Name Coverage
  Pack
passed #159420
pack

00:23:32