Shorten reading time line
Merge branch 'hotfix/updates'