PTFBUF-17

PTFBUF-17