Merge tag '0.34.1'