incorporate master commits for v2.2.19 release