Exception not needed because delete not seen as a function call any more
Merge branch 'master' into phpcs-fixer