Resolving this likely requires breaking API changes (26.2+)
Resolving this likely requires breaking API changes (26.2+)