Merge branch 'hotfix/hotfix1' into store
hotfix2 commit
Merge branch 'hotfix/hotfix2'