Update to paella 4.0.2
Merge branch 'hotfix/4.0.2' into develop