Merge branch 'fix/easy-timeline-dos' into 'develop'