Merge branch 'release/release01'
Fixed the bug
Merge branch 'hotfix/jira-0000' into dev