work on bug 917227, and landed patch for bug 584733