Merge remote-tracking branch 'sonata-project/master' (reverted from commit 0d003eb3ace278851ce5bd9339772fb403df56d1)