Merge branch 'main' into 39-handle-environment-variables-in-runtime