merged rel_0_9_0b1