Fix no longer needed
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	bin/freeze/main.spec