Merged v1.44 changes into path-and-envvars-fix branch