Forge Backport From 1057 to 1056