Fixed typos
Merge and fix conflicts.
Added missing php version constraints
Fix merge conflicts.