Merge branch '1706-dm-timeline-failure-fix' into 'develop'