Update diff of TLW-1816 and TLW-1819