Commit 8e6f1ef5e11 for php

commit 8e6f1ef5e116ba1aa0d00c16aa7e0decfd0a78ff
Merge: 35658d1bf5a 29af2f15bcb
Author: ndossche <7771979+ndossche@users.noreply.github.com>
Date:   Tue Oct 6 22:54:24 2026 +0200

    Merge branch 'PHP-8.6'

    * PHP-8.6:
      Fix merge