Fix PHP Notice
Merge php-notice changes.