Compatibility fixes required for D11. This PR include changes made by the bot and additional new changes.