Reviewed-by: Fernand Sieber <sieberf@amazon.com>