backport various hooks (this doesn't mean the hooks are called - but if
they are then ... tada no fatal

Conflicts:
	packages