Merge branch 'drop-backends' into 'master'