Merge "Test env documentation and new features"