Merge "Make openrc more robust for grenade scenarios"