Fix type
Merge remote-tracking branch 'refs/remotes/sonata-project/master'