Add diff for TLW-1816 and TLW-1819