0.9.9 merge