Merge branch 'mika/0.9.34'