0.9.5+ Update

Updating from main branch.