Bug959890+bug936400