Base: Improve support for firmware 2.1.0