Upgrade to Descriptors SNAPSHOT with EE7 support