Merged master to this branch

1 job for adapt_different_backends in 1 minute and 14 seconds