align 0.8.4 to master