Composer dependencies updated.
Current work checkpoint. See diff for details.
Composer dependencies updated.
merge