Merge branch 'fix/timeline-headers' into 'develop'