improvements based on Mirebalais smoke tests
improvements based on Mirebalais smoke tests