Merge "Fix for failing pipeline due to disabled log hosts"