Merging newer splunk changes