Merge branch 'hotfix/4.0.3'
Another fix for deffered fields
Merge branch 'hotfix/4.0.4' into develop