Be carefull. Not supported!!!
Merge branch 'hotfix-1.0.2'