Move to the snapshots and rework changed APIs in preparation for the upcoming rc8 release. See gh-11575