Pdi 10869: fix various issues with timestamp support