Merge code from v0.30.2 into master