Update for v0.3.9 development