Baseline update to 9a396b38405c951bc4f8a5aaebf5262789e2a325