All-in-one commit for release 0.9