Squash some warnings
Squash more warnings
merge stable into default