@markstory I've tried to make an implementation in https://github.com/ankr/cakephp/commit/545153c63f22bb9dd54257bcb6c9706b9d477774 - could you please take a look and tell me what you think?