Composer dependencies updated.
Current work checkpoint. See diff for details.
Merge branch 'develop' into cache-work