Merge "fix for filebeat"