fix for TF W-2123968
@bug W-2123968@
@rev shKhan@
Merging origin/lin/master-pending/TF-daylightsaving into master