Rm10027 now rm9305 hotfix

Putting these back in from IRC discussion today. Ignoring RM9709.