Merge branch 'tp/S1044992-S1045503-fix-BADHANDLE-and-STALE' into ibm_next_tmp