Fix for final fix
Merge remote branch 'origin/maint/php-797-regpagno2'