Import: Handle spaces for firmware 2.0.8