Merge branch 'hotfix/0.1.4'
Fixed parent controller for defvise
Merge branch 'hotfix/0.1.5' into develop