null-merge 5.0-bugteam --> 5.1-bugteam (bug 33461)