Merge branch 'releases/2-19-0' into releases/2-20-0

Merge branch 'releases/2-19-0' into releases/2-20-0 #324