v3.0.9

Merge fixes