[kernel] merge r13139 to 8.09