Fix replace of legacy package.
Merge branch 'develop'

Conflicts:
	composer.json