Reviewed-by: Bret Barkelew <bret.barkelew@microsoft.com>