Merge branch 'hotfix/1.10.6'
allow doctor flue in samsung
Merge branch 'hotfix/1.10.7' into develop