fix plaha
Merge branch 'hotfix_plaha' into develop