#6174 Incorporated change made in Master branch
#71176 Fixed bugs in DateTimeExtensions