Final changes for v0.36.0