force-complete patch for 0.9.95_plus_patch branch

replace #5308