Merge branch 'hotfix/4.0.2'
Fix deffered fields in Django
Merge branch 'hotfix/4.0.3' into develop