Merge release-0.6.19 to master