3.9.1 updates
Merge branch 'v1.2.1'