Merge branch 'fdonotif-fix-backend-dispose-race' into 'master'