Fix #1729 by updating some packages

Fixes #1729 

See Issue for additional test notes.