Update 0.3.4 release branch with master changes again