Filed bugs 1016970 and 1016977