DP-1061 using MutableDateTime instead