CORE-4073: Environment variables are excluded from command line preview