Installation and configuration enhancements

From C-7KDB897