Merge "add ELK note"