Merge remote-tracking branch 'origin/develop'
Refactor PHP library/code cleanup