4/5nh part 1
Merge pull request #767 from abhinavc/master

4/5nh part 1
4/1nh part 1
Merge pull request #768 from abhinavc/master

4/1nh part 1
1/kzg part 1
Merge pull request #769 from abhinavc/master

1/kzg part 1
Merge remote-tracking branch 'upstream/master'