merged r10942:11199 from digital branch