Merging changes from upstream and adding some comments