Applied patch from upstream PR to address issue with log config not working