Update according to new bedrock upstream merge.