#95351, #95361, #95011 next bug fix