Php 659 protos

The complete fix for this ticket needs to be in several PRs as it takes maaassive amount of time and not really a high priority