Merge branch 'hotfix/0.2.3'
Merge tag '0.2.3' into develop

Remove duplicate case conflicted files