prepare for 0.8.7 merge