Backport of https://github.com/cakephp/cakephp/issues/5667
Backport of https://github.com/cakephp/cakephp/issues/5667

et304383/passbolt_api,et304383/passbolt_api,et304383/passbolt_api,et304383/passbolt_api,et304383/passbolt_api