Thanks to Roland Gruber for the schema contribution. (cherry picked from commit 2e3b5db195)
2e3b5db195