Fixes for 9330, 10863, 10939