Sync DS similar to changes in upstream

See cakephp/cakephp@a9de83daeb14134