Merging release/0.9a32 into develop