Merge branch 'hotfix/1.10.8'
samsung redeem
Merge branch 'hotfix/1.10.6' into develop