Merge commit 'e5e2aacd [formerly d1184053] [formerly faf58af0]' Former-commit-id: 326d9b47 Former-commit-id: f7d287ee