align 0.9.0 to master