request for merge bz 1034290 and 1034290