Merge "Context improvement: add support for configing node environment"