Eric Dev Push

This will bring the main branch up to date. Please check diff carefully.