0.9.4 merger