0.9 -> 0.11 merges