@markstory Something like this? https://github.com/ankr/cakephp/commit/4f35d56603349bcdddfb5c174df79ffd91056e41