merge bug25428 into bug25429
ask qi whether it needs sync'ing, and why
merge bug25428 into bug25429
Change to 'confirms' | 'other' | 'false'
Merge bug 25429