resolve exos#5 and rata0071#14
Merge branch 'hotfix/exos#5' into develop