Merge "Rework PHP and vendor check"