Merge branch 'user-timelines-changelog' into 'develop'