Merge branch 'hotfix_0.3.21'

3 jobs for 0.3.21 in 3 minutes and 54 seconds (queued for 3 seconds)
latest