Upgrade and cleanup
Upgrade and cleanup
update auto*
Fixed building - now builds with stub class