Fixed NPE when comparing dates
Merge branch 'mbst-10179-last-updated-time' into stage