Merge branch 'hotfix/1.0.3'
Added duck for hotfix
Merge branch 'hotfix/1.0.4' into develop