See discussion #1267. Want to address the minimum needed to avoid public API changes post V1. Will investigate this and report more details.