Merge "BugFix : Changes to get ping between two hosts to work"