Fixed on master branch (after core-updates-frozen merge).
Closing.