Pre-v0.3.6 changes