Add initial changes for v0.9.2