[D1336] Changes 1, 2 based on comments in TP