Prepare for 0.9 merge window