Bug974867 r2