Merge branch 'ar/doc-env-variable-format' into maint