Merge "Doc cleanup, introduced environmental params"