Merge "Adjust CommandRunner to global config changes."