merge 186/patch datetime changes to master.
Merging origin/ssun/master-pending-merge186DateTimeChanges into master