Test of hotfix change
Merge branch 'hotfix/test-hotfix'