Updates after testing in embedded/non-embedded scenarios.