added change from 4.3.18 branch concerning time partitions and latest [TDS-450]