composer update
merge
composer update
Current work checkpoint. See diff for details.
composer update
if on windows, convert base path seps to /