Merge branch 'bug-6440_open-race'