Merge branch 'replace-negative-days-with-out-of-time-droid-540'

Merge branch 'replace-negative-days-with-out-of-time-droid-540' #8456