Merge branch 'prod' into render-collection-post-event

Conflicts:
	src/Plugin/Hal.php
Merge branch 'prod' into render-collection-post-event