Feature/php value flag

Upstream pull request cannot be merged due to deleted file.
I think it's best to merge this branch.