Another lines
Merge branch 'hotfix/QA'