Add comment on hotfix-2 from laptop
Merge branch 'hotfix-2'