Using generate and other cleanups
regenerate
Merged
Dependencies to 'any' to avoid SDK bumping