Merge branch 'feature/PHPVersionSupport' into develop
Merge branch 'develop' into feature/PHPVersionSupport