Release v2.3.0
Only focus on delivery if rendering after deliverySelected
Release v2.3.1
Merge branch 'master' into beta

Conflicts:
	package.json
Release v2.3.4-beta