Merge release branch from 0.19 (for history)