Merged master to this branch

1 job for adapt_different_backends in 1 minute and 14 seconds
Status Job ID Name Coverage
  Linux
passed #170229
BranchJobLinux

00:01:14