* commit '2c197a0708dc3cb26c335371b572a3c47ca33736': Make embedded hardware layers work. Bug #3369474