Here I am attaching patch with latest changes and inter-diff for reference. A...