Hotfix/php54 strict fix