Merged master to this branch

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

00:01:14