applying all changes because of disabled dummy_driver build