Merge tag 0.3.5 into releases/0.3 branch

The release branch is behind the latest tag